merge trunk
authorK. Handa <handa@gnu.org>
Sun, 19 Jan 2014 13:27:34 +0000 (22:27 +0900)
committerK. Handa <handa@gnu.org>
Sun, 19 Jan 2014 13:27:34 +0000 (22:27 +0900)
commite928d3d5a1a853cd27ec6fe3b4c82c9ce592b778
tree7fa294fa609fb35dc69e057f0e73e3d118adab5f
parent872df64430a7e5478d7ceaa9f86cc6712c5dd1b3
parent35e5ea0a62209f3c5c62ea1cdf566970353c387e
merge trunk